removed unnecessary attribute checks