Cleanup of branch to remove unneeded file changes