Partially removed lvish dependency.