Remove template debugging.
Re-order command initilization.