Clean up Context and Truck api