20080721 subverse: Clean up the system