simplification affects several deprecated files