Various fixes
Removing now unneeded code paths
Docs update