Clean up code after rebase on master