Fix deprecated method calls so that this library would not break existing implementations that upgrade
Remove incorrect @Override annotations