Refactoring: removed old unused throws and try catchs