small cleanups, ignore csi "q"