Improved memory options cleaning.