shad/MT: minor refactoring, remove useless variables.