I think we can get rid of this old code