cleanup - old foundation ++