Removed dependency on empty feature