Remove verbose debug prints, and take out hackery