removed extra fields not needed