K16q cleanup