Clean up api method