Replace remove with filter method