clean-up api method