Clean up push and pull