Cleanup of preferences, addition of late running services