Remove cruft from previous parts of developing factories.
Javadoc fix.