cleanup+docs fixes
Revert "cleanup+docs fixes"

This reverts commit b5c42ca6e30cef2f4c87adb88b47dc647935cd75.