remove If Statement -isKindOfClass