Merge "Deleted redundant code"