api change, clean up