Add some re-exports, remove unused structs