Cleanup, fix id issue.