update RootTools to 3.5 and clean up

Change-Id: I3745eea4d9054652f6240d610125fddbced5ac70