Clear commented extra code.
Factoring out field/instance definitions on their own include file.