Merge "Remove unused exceptions"