Removed buggy classes.