Remove unnecesary code
Merge conflict