Remove duplicate entry point + sort entry points