Revert "Some updates"

This reverts commit 94dc46a163be33433eae7a7365106f7187650909.