remove name hacks