Cleaned OnRootChanged