BZ-9746 - did a little clean up