[TASK] Remove plugin views use and fix code.