Cleanup path to API