back to 3-res stubs, along with mega cleanup