cleaning up some api stuff.  need to make a concerted effort soon