AUI-1109 Standardize destroy & destructor methods accross all modules
Merge branch 'pr-386'