ENYO-2405: Some clean-up.