models cleaned of old code