removed debug outputs and todos

Change-Id: I336b8ce659f5212382343f7e72490ff8201d803d
1 file changed