OPAL-2237: Derivation wizards views cleanup