Cleanup garbage.
Merge pull request #46 from d2rk/master

Cleanups