BZ-9741 cleanup