Removing unused junk, strengthen instruciton Var type.
Separated context out of Flavor