Remove backward compat mean -> avg switcher

This no longer seems to be working, so remove to simplify.