cleaning up API