removed debug mode switch