tidy some dead code (using http://closure-compiler.appspot.com)

Change-Id: I0bd0c3357ed108b0968dee8ec7b4e595ec423b29