[UPDATE] removed unused stuff