cleaning up Api