removed debug prints and old code