removed debug stuff except for console logs