Added cleanup to install