More validation and deleting old files