Removed unused imports
Refactoring members and removed navigation to index.xhtml
Refactoring changes 21/09/14