Cleanup; misc LV2 work