master branch cleanup.