Remove pointless try - catches