[IMP] crm: remove TODO posted by past me