remove-statement fix