update, remove others stuff