Removed references to bundle classes.