some reference clean up in prep for adding new functionality