ticket:6 cleanup