simplify cleanup
fix lvm bootup error messages
reflect lvm changes
reflect lvm boot changes