ticket:2 remove unnecessary code