Revert "Files cleanup for revert"

This reverts commit 5c90f0b49d8521254d9eed89c967c87e3d678a72.