Clean up commented code

Change-Id: I843d860b09ace99c7a0c12d79095053f21c62d74