Revert "Final commit"

This reverts commit f167ac50e31fb1805f9f1ca4008663b0b3247446.