clean up some circular stuff