project cleanup and service changes