I think this can/should be removed now that it is no longer used.