Cleanup from files

wip
Возможны баги