ticket:15 delete old code