urgh.  Can we remove these deprecated ones