Revert "Some cleanup, and add missing sphinx_spec"

This reverts commit 72cedff8f78f53fc91fb123aaf25727fc0dbc57e.
Add missing sphinx_spec