Have deleted not used files. Have made refactoring DM