Cleanup to move to new branch