Remove class addon implemenation
Remove property addon implemenation