[CDE-265] - Fix tooltip error and remove old and unused components