Remove remnants of memory managment