Refactor storage and file handlers (simplify), remove unused code

[#82948310]