Remove class addon implemenation