Remove commented lines from setup script

Change-Id: Ifb9ef7c2e1a972d0d686ba0102d7fbd1bd0f868e
Merge "Remove commented lines from setup script"