Removed deprecated files, closes #201