Removed more references to InitializingBean