Issue #24: code cleanup to remove tr1 depdendency