Remove some stuff, deprecated since 0.7.0