Removed duplicate classes