Removing unecessary throws