Removed extra fields