Little dependency cleanup