Index: src/main/java/it/finki/tinki/bootstrap/DataHolder.java
===================================================================
--- src/main/java/it/finki/tinki/bootstrap/DataHolder.java	(revision b31afbdb2c715a5b96a2ec89045752d8c652e207)
+++ src/main/java/it/finki/tinki/bootstrap/DataHolder.java	(revision 336d09ec13735b8bf9ab8fa94f748da07e9c15fb)
@@ -1,19 +1,11 @@
 package it.finki.tinki.bootstrap;
 
-import it.finki.tinki.model.Address;
-import it.finki.tinki.model.EmbeddedMatchId;
 import it.finki.tinki.model.Jobs.Job;
-import it.finki.tinki.model.Jobs.Work;
-import it.finki.tinki.model.Match;
 import it.finki.tinki.model.Skill;
 import it.finki.tinki.model.Users.Account;
-import it.finki.tinki.model.Users.Company;
-import it.finki.tinki.model.Users.User;
 import it.finki.tinki.model.enumerator.AccountType;
-import it.finki.tinki.model.enumerator.WorkType;
 import it.finki.tinki.repository.*;
 import it.finki.tinki.service.AccountService;
 import it.finki.tinki.service.WorkService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
Index: src/main/java/it/finki/tinki/helper/Matchmaker.java
===================================================================
--- src/main/java/it/finki/tinki/helper/Matchmaker.java	(revision b31afbdb2c715a5b96a2ec89045752d8c652e207)
+++ src/main/java/it/finki/tinki/helper/Matchmaker.java	(revision 336d09ec13735b8bf9ab8fa94f748da07e9c15fb)
@@ -22,4 +22,6 @@
         }
 
+        System.out.println(k/coef);
+
         return k/coef;
     }
Index: src/main/java/it/finki/tinki/model/EmbeddedMatchId.java
===================================================================
--- src/main/java/it/finki/tinki/model/EmbeddedMatchId.java	(revision b31afbdb2c715a5b96a2ec89045752d8c652e207)
+++ src/main/java/it/finki/tinki/model/EmbeddedMatchId.java	(revision 336d09ec13735b8bf9ab8fa94f748da07e9c15fb)
@@ -6,8 +6,6 @@
 
 import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
 import javax.persistence.OneToOne;
 import java.io.Serializable;
-import java.util.Objects;
 
 @Embeddable
Index: src/main/java/it/finki/tinki/model/Match.java
===================================================================
--- src/main/java/it/finki/tinki/model/Match.java	(revision b31afbdb2c715a5b96a2ec89045752d8c652e207)
+++ src/main/java/it/finki/tinki/model/Match.java	(revision 336d09ec13735b8bf9ab8fa94f748da07e9c15fb)
@@ -1,7 +1,4 @@
 package it.finki.tinki.model;
 
-import com.sun.istack.NotNull;
-import it.finki.tinki.model.Jobs.Work;
-import it.finki.tinki.model.Users.User;
 import it.finki.tinki.model.enumerator.WorkType;
 import lombok.Data;
@@ -12,14 +9,4 @@
 @Data
 public class Match {
-
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.AUTO)
-//    Long id;
-//
-//    @NotNull
-//    Long workId;
-//
-//    @NotNull
-//    Long userId;
 
     @Id
@@ -32,11 +19,4 @@
     public Match(){}
 
-//    public Match(Long workId, Long userId, float coefficient, WorkType type) {
-//        this.workId = workId;
-//        this.userId = userId;
-//        this.coefficient = coefficient;
-//        this.type = type;
-//    }
-
     public Match(EmbeddedMatchId embeddedMatchId, float coefficient, WorkType type) {
         this.embeddedMatchId = embeddedMatchId;
Index: src/main/java/it/finki/tinki/model/dto/InternshipResponseDTO.java
===================================================================
--- src/main/java/it/finki/tinki/model/dto/InternshipResponseDTO.java	(revision b31afbdb2c715a5b96a2ec89045752d8c652e207)
+++ src/main/java/it/finki/tinki/model/dto/InternshipResponseDTO.java	(revision 336d09ec13735b8bf9ab8fa94f748da07e9c15fb)
@@ -3,7 +3,5 @@
 import it.finki.tinki.model.Address;
 import it.finki.tinki.model.Jobs.Internship;
-import it.finki.tinki.model.Jobs.Project;
 import it.finki.tinki.model.Users.Company;
-import it.finki.tinki.model.Users.Team;
 import it.finki.tinki.model.enumerator.AccountType;
 import lombok.Data;
Index: src/main/java/it/finki/tinki/model/dto/ProjectResponseDTO.java
===================================================================
--- src/main/java/it/finki/tinki/model/dto/ProjectResponseDTO.java	(revision b31afbdb2c715a5b96a2ec89045752d8c652e207)
+++ src/main/java/it/finki/tinki/model/dto/ProjectResponseDTO.java	(revision 336d09ec13735b8bf9ab8fa94f748da07e9c15fb)
@@ -1,8 +1,5 @@
 package it.finki.tinki.model.dto;
 
-import it.finki.tinki.model.Address;
-import it.finki.tinki.model.Jobs.Job;
 import it.finki.tinki.model.Jobs.Project;
-import it.finki.tinki.model.Users.Company;
 import it.finki.tinki.model.Users.Team;
 import it.finki.tinki.model.enumerator.AccountType;
Index: src/main/java/it/finki/tinki/model/dto/UserResponseDTO.java
===================================================================
--- src/main/java/it/finki/tinki/model/dto/UserResponseDTO.java	(revision b31afbdb2c715a5b96a2ec89045752d8c652e207)
+++ src/main/java/it/finki/tinki/model/dto/UserResponseDTO.java	(revision 336d09ec13735b8bf9ab8fa94f748da07e9c15fb)
@@ -1,7 +1,4 @@
 package it.finki.tinki.model.dto;
 
-import it.finki.tinki.model.Jobs.Internship;
-import it.finki.tinki.model.Jobs.Job;
-import it.finki.tinki.model.Jobs.Project;
 import it.finki.tinki.model.Skill;
 import lombok.Data;
Index: src/main/java/it/finki/tinki/repository/AddressRepository.java
===================================================================
--- src/main/java/it/finki/tinki/repository/AddressRepository.java	(revision b31afbdb2c715a5b96a2ec89045752d8c652e207)
+++ src/main/java/it/finki/tinki/repository/AddressRepository.java	(revision 336d09ec13735b8bf9ab8fa94f748da07e9c15fb)
@@ -5,6 +5,4 @@
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
-
 @Repository
 public interface AddressRepository extends JpaRepository<Address, Long> {
Index: src/main/java/it/finki/tinki/repository/InternshipRepository.java
===================================================================
--- src/main/java/it/finki/tinki/repository/InternshipRepository.java	(revision b31afbdb2c715a5b96a2ec89045752d8c652e207)
+++ src/main/java/it/finki/tinki/repository/InternshipRepository.java	(revision 336d09ec13735b8bf9ab8fa94f748da07e9c15fb)
@@ -2,5 +2,4 @@
 
 import it.finki.tinki.model.Jobs.Internship;
-import it.finki.tinki.model.Jobs.Work;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
Index: src/main/java/it/finki/tinki/repository/MatchRepository.java
===================================================================
--- src/main/java/it/finki/tinki/repository/MatchRepository.java	(revision b31afbdb2c715a5b96a2ec89045752d8c652e207)
+++ src/main/java/it/finki/tinki/repository/MatchRepository.java	(revision 336d09ec13735b8bf9ab8fa94f748da07e9c15fb)
@@ -13,4 +13,3 @@
 public interface MatchRepository extends JpaRepository<Match, EmbeddedMatchId> {
     List<Match> findAllByEmbeddedMatchIdUserAndTypeOrderByCoefficientDesc(User user, WorkType type);
-//    List<Match> getAllByUserIdAndTypeOrderByCoefficientDesc(Long uId, WorkType type);
 }
Index: src/main/java/it/finki/tinki/service/impl/AccountServiceImpl.java
===================================================================
--- src/main/java/it/finki/tinki/service/impl/AccountServiceImpl.java	(revision b31afbdb2c715a5b96a2ec89045752d8c652e207)
+++ src/main/java/it/finki/tinki/service/impl/AccountServiceImpl.java	(revision 336d09ec13735b8bf9ab8fa94f748da07e9c15fb)
@@ -16,10 +16,7 @@
 import it.finki.tinki.service.AccountService;
 import it.finki.tinki.service.MatchmakerService;
-import it.finki.tinki.service.WorkService;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @Service
Index: src/main/java/it/finki/tinki/service/impl/MatchmakerServiceImpl.java
===================================================================
--- src/main/java/it/finki/tinki/service/impl/MatchmakerServiceImpl.java	(revision b31afbdb2c715a5b96a2ec89045752d8c652e207)
+++ src/main/java/it/finki/tinki/service/impl/MatchmakerServiceImpl.java	(revision 336d09ec13735b8bf9ab8fa94f748da07e9c15fb)
@@ -6,5 +6,4 @@
 import it.finki.tinki.model.Jobs.Job;
 import it.finki.tinki.model.Jobs.Project;
-import it.finki.tinki.model.Jobs.Work;
 import it.finki.tinki.model.Match;
 import it.finki.tinki.model.Skill;
@@ -61,5 +60,4 @@
         if(matches.size()!=0) {
             matches.forEach(match -> {
-                System.out.println(match.getCoefficient());
                 jobs.add((Job) match.getEmbeddedMatchId().getWork());
             });
Index: src/main/java/it/finki/tinki/service/impl/SkillServiceImpl.java
===================================================================
--- src/main/java/it/finki/tinki/service/impl/SkillServiceImpl.java	(revision b31afbdb2c715a5b96a2ec89045752d8c652e207)
+++ src/main/java/it/finki/tinki/service/impl/SkillServiceImpl.java	(revision 336d09ec13735b8bf9ab8fa94f748da07e9c15fb)
@@ -2,5 +2,4 @@
 
 import it.finki.tinki.model.Skill;
-import it.finki.tinki.model.exception.SkillNotFoundException;
 import it.finki.tinki.repository.SkillRepository;
 import it.finki.tinki.service.SkillService;
Index: src/main/java/it/finki/tinki/service/impl/WorkServiceImpl.java
===================================================================
--- src/main/java/it/finki/tinki/service/impl/WorkServiceImpl.java	(revision b31afbdb2c715a5b96a2ec89045752d8c652e207)
+++ src/main/java/it/finki/tinki/service/impl/WorkServiceImpl.java	(revision 336d09ec13735b8bf9ab8fa94f748da07e9c15fb)
@@ -4,9 +4,7 @@
 import it.finki.tinki.model.Jobs.Job;
 import it.finki.tinki.model.Jobs.Project;
-import it.finki.tinki.model.Match;
 import it.finki.tinki.model.Skill;
 import it.finki.tinki.model.Users.Account;
 import it.finki.tinki.model.enumerator.AccountType;
-import it.finki.tinki.model.enumerator.WorkType;
 import it.finki.tinki.repository.InternshipRepository;
 import it.finki.tinki.repository.JobRepository;
@@ -14,5 +12,4 @@
 import it.finki.tinki.repository.ProjectRepository;
 import it.finki.tinki.service.AccountService;
-import it.finki.tinki.service.MatchmakerService;
 import it.finki.tinki.service.SkillService;
 import it.finki.tinki.service.WorkService;
Index: src/main/java/it/finki/tinki/web/controller/LoginController.java
===================================================================
--- src/main/java/it/finki/tinki/web/controller/LoginController.java	(revision b31afbdb2c715a5b96a2ec89045752d8c652e207)
+++ src/main/java/it/finki/tinki/web/controller/LoginController.java	(revision 336d09ec13735b8bf9ab8fa94f748da07e9c15fb)
@@ -13,10 +13,8 @@
 import it.finki.tinki.service.MatchmakerService;
 import it.finki.tinki.service.WorkService;
-import org.apache.coyote.Response;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
 import java.util.List;
-import java.util.Map;
 
 @RestController
@@ -35,8 +33,8 @@
     }
 
+    //TODO: ADD JOB/INTERNSHIP RESPONSE TYPE TO COMPANY AND TEAM ---------------------v
+
     @PostMapping(path = "/login")
     public LoginResponseDTO testPage(@RequestBody AccountLoginDTO body) throws ResponseStatusException {
-
-        System.out.println(body);
 
         Account a1 = accountService.findUser(body.getEmail(), body.getPassword(), body.getType());
@@ -89,5 +87,5 @@
                 tDto.setEmail(a1.getEmail());
                 tDto.setName(a1.getName());
-                tDto.setType(AccountType.USER);
+                tDto.setType(AccountType.TEAM);
                 tDto.setMembers(((Team) a1).getMembers());
 
@@ -106,5 +104,5 @@
                 cDto.setEmail(a1.getEmail());
                 cDto.setName(a1.getName());
-                cDto.setType(AccountType.USER);
+                cDto.setType(AccountType.COMPANY);
                 cDto.setAddress(((Company) a1).getAddress());
 
Index: src/main/java/it/finki/tinki/web/controller/RegisterController.java
===================================================================
--- src/main/java/it/finki/tinki/web/controller/RegisterController.java	(revision b31afbdb2c715a5b96a2ec89045752d8c652e207)
+++ src/main/java/it/finki/tinki/web/controller/RegisterController.java	(revision 336d09ec13735b8bf9ab8fa94f748da07e9c15fb)
@@ -1,11 +1,6 @@
 package it.finki.tinki.web.controller;
 
-import it.finki.tinki.helper.Matchmaker;
-import it.finki.tinki.model.Jobs.Internship;
-import it.finki.tinki.model.Jobs.Job;
-import it.finki.tinki.model.Jobs.Project;
 import it.finki.tinki.model.Skill;
 import it.finki.tinki.model.Users.Account;
-import it.finki.tinki.model.Users.User;
 import it.finki.tinki.model.dto.UserRegisterDTO;
 import it.finki.tinki.service.AccountService;
@@ -55,4 +50,6 @@
     }
 
+    //TODO: ADD TEAM AND COMPANY REGISTER TDO --------------------------------------v
+
     @RequestMapping(path = "/team", method = RequestMethod.POST)
     private Map<String, String> registerTeam(@RequestBody String email,