Updated to 4.21 and updated Remove function