Remove redundant files
Fix validation