cleanup; trying to figure out sdk compatability