remove the code for clean service