I think this block of changes can be removed now