Fix deprecated methods

Fix deprecated methods so that this library could be used without re-writing by existing implementations
Remove incorrect @Override annotations