[ssu-board-mappings] Cleanup patch based on review comments