get rid of several dirty hacks