Revert "Final commit"

This reverts commit 0a111c796c32d7c55d744a2177f79314ea2c4134.