Cleanup commit.

All cleanup done today (still doesn't build).

Shikhin Sethi, draumr.shikhin@gmail.com