Tweak comments and remove Cut mappings