cleaning to avoid merge conflicts