Remove check of class loaded

Could wrap the whole class loading block in an else if necessary, but I don't think it is