Cleanup Api Call methods