Various simplifications & update to VaylerynLib 0.6.x