Minor runner clean up