Fix build errors
Toggles: cleanup class and quiet down logging

Change-Id: I39f1382ee2d340a2d2676aa85e6fbc6641bb3c61
Signed-off-by: Roman Birg <romanbirg@gmail.com>