cleaned up service
added layers and removed old ones