Cleaned up duplicate classes