Base cleanup