remove dead code
fix block device comparing function (2)