Cleaned up Enabled and Disabled