Removed old references to behaviors, added back some calls to component
functions.