Cleanup: deleted unused code

Change-Id: I1b73fea33645e9266b9a67e1a9790ba6f0ea84da