[michael] Refatored cleanup to handle specific cleanups
Merge branch 'master' of github.com:Wallaceh/Cucumber_Java