removing some weird hacks