Remove unused rootScope
Merge branch 'timeout'