More cleanup, removing of @RequiredArgsConstructor