Buggy remove implementation