Fix previous hack and remove output noise used for debugging