Removed manual dependencies