Removed COLS and ROWS constants