Clean up the first two API patches