remove device-mapper dependency.
Merge branch 'feature-remove-device-mapper-dependency'