Remove manual dependencies