* Avoid name clashes at deletion
* Removal of used files
* Cleaned up the code