Integrating work done by Siddique
Removed config file