removed deprecated files
Merge pull request #215 from scopatz/rm-dep

removed deprecated files
got to the point where I would expect things to fail.
fixed conflicts