keep adding code comments
refactor code for onRemove