Recursive removal fixed