Clean up for real work