maps clean up ish and the new service