This reverts commit c1cf1b9a. Code Clean up approved by TSC on Feb 2nd Change-Id: I069215c71aaebf3cf7009a3538e4e5112e66103d