Removed unnecessary exceptions and code