Cleanup some more, think this is just about finished at this point