remove more stuff
add export