More cleanup around root level to maintain architecture