Removed obselete code

Removed obselete code