Remove BlockCoord instantiation from solar upgrade processing