Squid: Avoid commented-out lines of code

Fixed violations in codebase.

https://trello.com/c/RGNgnkKs

Change-Id: If3f5bd083f4f0268250f31b1c363a94b33735e9b