Misc 1.0.0
Revert "Misc 1.0.0"

This reverts commit 4e2753c26619e70654a64957e0c2fe64b711333c.