Fixed complex removals not working as expected.