Cleaning up static array layout and model relation