Revert "Final Changes"

This reverts commit 9e877b1fedc45f738a10645f405bc168a89e75c8.