clean model utils for now