Cleanup to prepare for pyramid_switchboard release.