std::remove_if not used

Change-Id: I363ac477d364a1b428ebe5181973ff28dc3f4a77