Removed checked exceptions
Removed redundant class