removed debug specific code