Started cleanup now that pattern has emerged