Merge "Remove unnecessary code"