Latest cleanups from cutting-edge