deprecating some old tools
minor refactoring of modeling utils