Removed dead code, re-ordered SCPI clearing to allow device init
functions to report errors