Remove unmangle, and fix the problem once and for all using everywhereBut