Clean up code, about to start on unfailing completion