HDFS-5404: remove bogus return statements