clean logic, add remove button