Remove more left over foundation code