Revert "Extensive update"

This reverts commit 5e2b17138d030611f196ea96bf900411b9b57028.