Remove buttons working once more.