Remove unused exception throws
Remove unneeded return statement
Update Javadoc to remove unthrow Exception