more location clean up