No more OVF boilerplate