[!!!][TASK] Clean up ObjectManager injection of CommandController