Merge "Cleaning up some and removing unused calculations code in CellLayout" into main