removed debug syso's or put them behind if statements