got rid of some overlapping location manager usage