Merge "Remove useless code"