cleanup to prepare for merge