remove dead code
update syntax for 2.5