Cleanup: Removed unused code

Change-Id: I853bb724356a5f2dd9ac83e70c56a2871c4786ad
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Merge "Cleanup: Removed unused code"