group panel replaced + cleanup