Revert "Finalv1"

This reverts commit 0a83e472607cf4a8e7307379e5fb00095c20e63b.