Brought in line with archetype

Also whacked redundant documentation