clean up no-longer-use files
Merge branch 'feature'