Don't need to keep these around after we've moved to 0.8