Update documentation
Remove some unused code