Getting ready to merge

Removed old code