Update documentation, remove some redundant code.