slot2: General cleanup