Doc update
Bugfix
Removing dead code
Doc update