Removed throws statements