further model entity cleanup (no entity reallocs and easier info retrieval)