Removed empty method and unused variable

Change-Id: I0af5165b89e40872ea9c6f228c0b032185e1be2f