Remove use of foo in code