Some cleanup that has been done before tagging this release as version 3