Base clean up