Refactoring JSP & .java files, deleting repeted code and unused files