Get rid of Enabled2

Didn't really serve any purpose anyway