Removed obselete classes