remove hacks for Mono