Squid: Avoid commented-out lines of code

Fixed violations in codebase.

https://trello.com/c/RGNgnkKs

Change-Id: Ic838dfd41c88f2e8a79e26331ee995cc0b6dbb46
Merge "Squid: Avoid commented-out lines of code"