[lombok] cleanup code