[TASK] Cleanup require statements