solid pass at cleaning up old references and reducing noise