Remove orphaned file and cleanup class naming.