code cleanup; scripts complete!