Cleaning up TRUNK-3773