Cleanup a bit of unnecessary stuff.