Change-Id: Idfc93948e59a181321d79b365e638d63e256a16f
Remove some testing code that is not necessary for the service. Change-Id: Idd09d62bf022d6e66943983f98642fc3c9aa72f7
func init() code isn't that well defined and reordering of them could cause problems when starting the whole process from it. Change-Id: I4088a0db156ece15354877011a481f6f91c9b332