Remove duplicate entity checking