Synchronize with master, further cleanup