Cleaning up Api