Improved remove