Remove silly legacy code and update docs
Merge