Cleaned up model builder no longer used