Remove hardcoded dependencies