sync with master, remove deprecated files