Cleanup, finished v2.