WIP clean up top level objects