Code Removal

Removed not needed code.