removed ifdefine