add cleanup method
Merge pull request #37 from zenoss/feature/ZEN-13790

add cleanup method