Tagged some client code as to be removed.