Remove old images
Refactor some classes