I think this could be removed now.