Cleanup, fixing modelIDs