Launch code cleanup