Cleanup.  Prep for drag and drop theme support branch.