Removed debug booleans