cleaning old files
merging to master