remove now working correctly