Cleanup of core services