Removing prefixes
Merge conflicts