Rm use of Class alises deprected since 0.5