Added cleanup to build script