Commented out unused Foundation components