Fixed Remove function