Refactor managers

in some func calls we have mgr + (constants or version), where we don't need to pass both since the manager has all that built-in. Cleaning up manager params.