Clean up extra changes made while experimenting with apis.