Merge "Deleting unused code"