Cleaning up the TW2 edition