[TASK] Remove user and template fields form modules