Further cleanup to remove bug.