Documentation update + some dead code elimination