Cleaning-up of code
Removed old code