Base: More cleaning