Put symbols in proper contexts.
Get rid of unsafe Remove[] (TODO: don't execute code more than once)