Removed extra required fields