Remove unneeded code
Update to version v562