#59 shut some location update parts down