Follow up to clean up code - TRUNK-4191