More mem mgmt cleanup