Commenting out duplicate/inherited stuff (done)