more dependency cleanup