Merge "Removed redundant code"