Cleanup some unnecessary bits