Removing dependency on lombok