Removed path and cdbs dependency