Do we just want to remove this completely?