Fixing cleanup methods, use instance methods
Merge pull request #11 from Telmate/PS-2221 fix cleanup methods, and use instance based stuff for a lot of things
Merge pull request #11 from Telmate/PS-2221 fix cleanup methods, and use instance based stuff for a lot of things