Big cleanup
Solving merge conflicts + cleanup