Merge "Remove useless use of current and end"