removed obselete stuff