[REFAC] Remove dead code