Clean-up Flag entity doc blocks