cleaned up and removed debug stuff