Fix validation errors, remove old files