cleanup and removed multi-catch