Merge "Remove unneeded "throws""