removed conditional class