Remove debug prints and add assert