Merge pull request #1804 from antonio-nino-diaz-arm/an/cleanup

Minor cleanup