removing ugly hacks