remove some experimental classes
force use of sparse structures more places