code cleanup in services-csw