Memory.c Cleanup