Removing code that is not in used. DHH-530