remove mix between model and view