cleanup to unbreak build after crazy merge commit