get rid of more hacks