more toggle button cleanup