Further work on removing rootscope