remove some small hacks and deprecated imports