Removed obselete code/files