removed hard coded universal set