Clean up debug related code