S-1 Clean up