Revert "Final modifications"

This reverts commit 40ff8e5e0e9ebc42111e076e8b87e30ec3152032.