Update old paths
Remove useless instanceof check