Cleanups from scapegoat