Remove hard-coded path
Remove currently unneeded dependencies