Remove hard dependencies