Cleaned up old classes for overlay.