AUI-1109 Standardize destroy & destructor methods accross all modules