Remove diagnostic code