MAINT: remove debug prints and more replaced code