Fixed remove function
Remove function now returns during a remove