Remove debugging.. move to another branch