Remove some needless 'using' blocks

since the elaborator is now cleverer