removed dependency on features