Cleanup of last night's debugging