Remove duplicated files
Simplified expression in checkfields and notDefined