Remove unused class, cleanup.