Remove code related to options
Include Foundation submodule