fix bug and remove depends