Working WIP for reset-remove semantic