clean up and fix references