cleanup to remove excessive var statements