remove old files
Second version with cleaned code