Dropping some unncessary return's whose job is also done by the final return statement.
Signed-off-by: Enrico Weigelt, metux IT consult info@metux.net