Add some missing dependency and clean unneccesery require fields