Clean up DSL.

Remove unused instructions and remove redundant "q" suffixes.