ENG-6225 cleaned up 'foo' code