Update Replace and remove.cpp