Added cleanup to help rake