Revert "Various updates"

This reverts commit c72ad53afb520c5305bafb35f4b39fe6c31f47fa.