Cleanup all the unnecessary bits...