Misc cleanup that breaks builds :P