remove currentRootPackage need
cleanup :-)

fix modelEquals bug