Cleaned up feature toggles closes #953