Cleanup some stuff I missed