Merge "Clean up startup script"