removed files
merging done with sama