[37] Move logic from managers to systems