misc: refractor, remove unused stuff