Removing ::class usage