part of button cleanup