P35: reduce imports