Sonar violation clean ups.

For action plans :

 * Rename hidden fields.
 * Remove trailing comments.