remove hacks to workaround types