Cleanup of master branch