remove lombok and add getter and setters to entities