Implemented removals, and improved object class detection