Base: More cleaning!