tooltip fixed + removed some dead code