ticket:15 cleanup