More debug prints removed