remove unused stuff
fix build errors