Remove several implicit dependencies