Clean of Catch to Generic