delete deprecated files; fix conflicts