Old code removal

Removing old commented code