- remove unused code - add @Override - change the inappropriate cast Change-Id: Ib25b4939e5b4273794ab0f6349776b5b62d89894
TODO: Cleanup will follow. Change-Id: I4a68ba9f2f55760aa24187f1f13fdfa8a0b70963