Some ido cleanups