Remove class as it is useless