NEXUS-7608: Cleanup of class

That had no reason to be on itself.