Removed last traces of Catch from project.