remove some WTF! code