Clean up for version 2.