Remove unnecessary throws from functions