ameo/header – clean up & make passable for now