Removing experimental/unstable/untested/debug stuff