remove old code from Location