Removed unused code and objects.