Added onRemove
Build