startup code cleanup