Remove debugging code. Very little changes.