Potential Entries cleanup