remove not needed classes, refactor tick=update