service cleanup

fixes #345