Finished removing from things import *
Fixing things in canoncommands