Dropping some stuff
Fixing merge conflicts