Add cleanup to 0.8 and 0.10