I think this stuff can be deleted since it's specified above now.