simplification fixes