Removed more pmem code