Removed references to bundle