Clean up of entity kind visitors