remove REV1 ifdefs, add blackout intervals