Simplify remove for better performance.