Removal of Foundation classes