Removed references to widgets