Removed optional fields in favour of normal fields.
Removed optional fields in favour of normal fields.

Sheepzez/Matrixonator-Java,projectgoav/Matrixonator-Java,Sheepzez/Matrixonator-Java,Sheepzez/Matrixonator-Java,projectgoav/Matrixonator-Java,projectgoav/Matrixonator-Java