remove unused stuff
fix export