Fix depency warning and remove useless stuff