Cleanup some of this stuff