Remove debugging statements
merge next-stable