Cleaned up atmosphere service, removed fluff