Remove deprecated files

Remove deprecated files