Fix merge conflict
Remove foundation and FA