External start on GP5, code cleanup