Removed a lot of Derived Variables treated as State in VHDL