ameo/variables – clean up