Clean up, remove foundation
merge