Removed jsf
Solving conflicts after jsf removal