Continued to remove getters and setters, due to lombok