[NOBTS] Cleanup the impl