parse and map services are singletons+ cleanups