remove unwanted replace
Merge branch 'feature/remove_replace' into feature/test