Changed toggleRemove to always work properly