Removed debug tunable, cleanup