Removed experimental feature dependency