Flex comments various clean up