Some cleanup with respect to the master branch.