Merge "Remove optional LVMX service"