Semi working remove
Improved remove