Remove deprecated code and other updates relating to the previous 4 commits.