CHANGED:clean up the code;
DELETED:SubView and its mediator;