Reduce excess code from Foundation Core

- port foundation updates from braces foundation project