code cleanup in all services