Commit 40
Revert "Commit 40"

This reverts commit 81ada39752fdeacfa04d6064060b3e7173cfebd9.
Clean up