#4 cleanup to get rid of a few (deprecation) warnings
#4 cleanup to get rid of a few (deprecation) warnings - a bit too eager