Remove preview workarounds completely

 * Seems to work fine without, and ADC Team did the same.
Various changes