Cleanup services and added headers