Removed debug/development code