removed location stuff from 1st prototype