Trimmed some memory usage