ticket:30 cleanup