Unrelated dependency cleanup