Memory related issue cleanup