Merge "Remove <code> which no longer makes sense."