Removed obselete code