Further dependency cleanup