code changes to remove deprecated/unused errors