Rays Spreadsheet cleanup