Now actually doing cleanup.
Merge pull request #26 from xStrom/cleanup

Actually do cleanup.