Cleanup in preparation for release 1.5.0