Cleaned up the master branch.