index entities and remove stray annotation.