RAZ-1851: Customisation: Clean up interface