Remove unused class and changed syntax