Revert "Some updates"

This reverts commit eaf8cc6f89d4eafd1a7c5d59319210083a010389.
cv