Removed unused utilities

Change-Id: Ifa3e7b820d594303c6c02eae12f55bce2bd1dacc
Merge "Removed unused utilities"