Hosters: first cleanup for setup vars