QA: fully spell instrd, remove dead code