Add INT-1 plus general cleanup