Memory related issues - final cleanup