DEP-22 removal of unnecessary files