More resharper cleanup - removing empty catches and removing unused files.