Removed commented out classes