whitepace, unwanted fixmes, wrong comments, jshint Change-Id: I571b2b3a7e9fbbe7c93262ee9783fbe334d9170e