removed class singleton variable