Removed unneeded return calls.