clean up to help rest service