package button cleanup