Removed obselete clutter