Removed unused instances of the class