Revert "Various updates"

This reverts commit ecef9a0956b0746fc10239b00842c4d0408d883c.