3151f6a Step six: remove depedency on UserInterface.