Removing memory allocation stuff.. I think