taking out the dumb map stuff!