This class doesn't appear to do anything. Can we remove it?