Made some more memory cleanups
Memory cleanup