remove useless dependencies + code cleaning