remove unnecessary error handling