Merge "Remove code markers"