Some cleanup for stuff leftoever from testing that I missed