Fixed cleanup + Removed getMemUsage