code cleanup to last commit