More bits of cleanup