removed obselete code