Removed some deps; fixed linking