Delete image files
Code cleaning
Add validations