Comprehensive duplicate checking
Remove unused file