Remove a butt load of debug

Change-Id: I000ec170a1eeeec68f323030f28a77c796bed3ef