Removed commented out code blocks

Change-Id: I0c3c2d2a237a7a176db1fc55acbbd7251cb15eb9