removed location fields; unneccessary