get rid of unused stuff, add rest