added clean-up method to Setup
Merge pull request #1 from tensorjack/master

Cleanup code