w64 - remove some ugly dirty-hacks