Updates and cleanup

Cleanup includes removing generated docs from the source
Updates are to locality uniqueness