some more root cleanups