Remove getBean() usages