Remove foundation init
Remove more unused code