- remove unused code - add @Override - change the inappropriate cast Change-Id: Ib25b4939e5b4273794ab0f6349776b5b62d89894