Tidy up

Removed optionsrow.h, .cpp
Updates to the ANOVA form

Updates to the ANOVA form, and a tidy up.