cleanup to initial commit