Cleaning up LocationDB Code