cleaned out some unused refs