Revert "Add Features & Fixes"

This reverts commit 819b4991b6180bec9f84af490922145fc7179b6e.
Revert "Fix Valid Toggle"

This reverts commit 433c598ae1cff52adcd67f8988ebd5b8845dc962.