ticket:1 cleanup