Deleting some of the unused parts and commented not-yet-used parts.