Added some more memory free-ing