remove unused stuff and improve a couple things