[!!!][TASK] Cleanup and remove old filefunc logic