[TASK] CGL Cleanup of ResourceStorage