remove unneeded code
there are some problems with affix