Some cleanup + re-add support for hadoop.uri