diff --git a/srsue/hdr/phy/nbiot_phy.h b/srsue/hdr/phy/nbiot_phy.h
deleted file mode 100644
index 575c94431..000000000
--- a/srsue/hdr/phy/nbiot_phy.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- *
- * \section COPYRIGHT
- *
- * Copyright 2013-2015 Software Radio Systems Limited
- *
- * \section LICENSE
- *
- * This file is part of the srsUE library.
- *
- * srsUE is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- *
- * srsUE is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * A copy of the GNU Affero General Public License can be found in
- * the LICENSE file in the top-level directory of this distribution
- * and at http://www.gnu.org/licenses/.
- *
- */
-
-#ifndef UEPHY_H
-#define UEPHY_H
-
-#include "srslte/srslte.h"
-#include "common/phy_interface.h"
-#include "common/log.h"
-#include "phy/phy_metrics.h"
-#include "phy/phch_recv.h"
-#include "phy/prach.h"
-#include "phy/phch_worker.h"
-#include "phy/phch_common.h"
-#include "radio/radio.h"
-#include "common/task_dispatcher.h"
-#include "common/trace.h"
-#include "common/mac_interface.h"
-#include "common/interfaces.h"
-
-namespace srsue {
-    
-typedef _Complex float cf_t; 
-
-class phy
-    : public phy_interface_mac
-    , public phy_interface_rrc
-{
-public:
-  phy();
-  bool init(srslte::radio *radio_handler, 
-            mac_interface_phy *mac, 
-            rrc_interface_phy *rrc, 
-            srslte::log *log_h, 
-            phy_args_t *args = NULL);
-  
-  void stop();
-
-  void set_agc_enable(bool enabled);
-
-  void get_metrics(phy_metrics_t &m);
-  
-  void set_crnti(uint16_t rnti);
-  
-  
-  static uint32_t tti_to_SFN(uint32_t tti);
-  static uint32_t tti_to_subf(uint32_t tti);
-
-  void enable_pregen_signals(bool enable); 
-  
-  void start_trace();
-  void write_trace(std::string filename); 
-  
-  /********** RRC INTERFACE ********************/
-  void    reset();
-  bool    status_is_sync();
-  void    configure_ul_params(bool pregen_disabled = false);
-  void    resync_sfn(); 
-  
-  /********** MAC INTERFACE ********************/
-  /* Functions to synchronize with a cell */
-  void    sync_start(); 
-  void    sync_stop();
-
-  /* Instructs the PHY to configure using the parameters written by set_param() */
-  void    configure_prach_params();
-  
-  /* Transmits PRACH in the next opportunity */
-  void    prach_send(uint32_t preamble_idx, int allowed_subframe = -1, float target_power_dbm = 0.0);  
-  int     prach_tx_tti();
-  
-  /* Indicates the transmission of a SR signal in the next opportunity */
-  void    sr_send();  
-  int     sr_last_tx_tti();
-
-  // Time advance commands
-  void    set_timeadv_rar(uint32_t ta_cmd);
-  void    set_timeadv(uint32_t ta_cmd);
-  
-  /* Sets RAR grant payload */
-  void    set_rar_grant(uint32_t tti, uint8_t grant_payload[SRSLTE_RAR_GRANT_LEN]); 
-
-  /* Instruct the PHY to decode PDCCH with the CRC scrambled with given RNTI */  
-  void    pdcch_ul_search(srslte_rnti_type_t rnti_type, uint16_t rnti, int tti_start = -1, int tti_end = -1);
-  void    pdcch_dl_search(srslte_rnti_type_t rnti_type, uint16_t rnti, int tti_start = -1, int tti_end = -1);
-  void    pdcch_ul_search_reset();
-  void    pdcch_dl_search_reset();
-
-  /* Get/Set PHY parameters interface from RRC */  
-  void get_config(phy_cfg_t *phy_cfg); 
-  void set_config(phy_cfg_t *phy_cfg); 
-  void set_config_dedicated(LIBLTE_RRC_PHYSICAL_CONFIG_DEDICATED_STRUCT *dedicated);
-  void set_config_common(phy_cfg_common_t *common); 
-  void set_config_tdd(LIBLTE_RRC_TDD_CONFIG_STRUCT *tdd); 
-  void set_config_64qam_en(bool enable);
-
-
-  float   get_phr();
-  float   get_pathloss_db();
-    
-  uint32_t get_current_tti();
-  void     get_current_cell(srslte_cell_t *cell);
-  
-  void    start_plot();
-  void    start_channel_emulator(const char *filename, int *path_taps, int nof_paths, int nof_coeffs, int nof_samples, int nof_tti);
-    
-private:
-    
-  uint32_t nof_workers; 
-  
-  const static int MAX_WORKERS         = 4;
-  const static int DEFAULT_WORKERS     = 2;
-  
-  const static int SF_RECV_THREAD_PRIO = 1;
-  const static int WORKERS_THREAD_PRIO = 0; 
-  
-  srslte::radio         *radio_handler;
-  srslte::log           *log_h;
-
-  srslte::thread_pool      workers_pool;
-  std::vector<phch_worker> workers;
-  phch_common              workers_common; 
-  phch_recv                sf_recv; 
-  prach                    prach_buffer; 
-  
-  srslte_cell_t cell;
-  
-  phy_cfg_t  config;
-  phy_args_t *args;
-  
-  /* Current time advance */
-  uint32_t     n_ta;
-    
-  bool init_(srslte::radio *radio_handler, mac_interface_phy *mac, srslte::log *log_h, bool do_agc, uint32_t nof_workers);
-  void set_default_args(phy_args_t *args);
-  bool check_args(phy_args_t *args); 
-
-};
-
-} // namespace srsue
-
-#endif // UEPHY_H