removed some hardcoded deps