Removed unused code

USERGRID-1861