got rid of some dev hacks