[*] removed unused stuff