[TASK] Entry script handling cleanup