Merge "Remove Unnecessary Codes"