Cleaning up after merge (not done yet though)