STY: remove commented code commited by mistake.
BUG: fix wrong import in scenario imported by stupid nose.