remove - Base: Reduce memory leaks