Debug logging and clean up

Change-Id: I046647a20f0faaeac0893b371c5f7463a8456ab5