This doesn't appear to be used. Remove?