Removed debug switch