CLSN-1267 : remove stateless as well