Trunk 4143 Clean-up

Cleaned up outstanding issues with TRUNK-4143.