Removing some unused include files; Correcting nomenclature for cart; hiding quick...