removed location stupidness