Removed unused nested classes