entries scanning + massive cleanup