tab complete cleanups