Removed dependency on any module