Fixed some files
Revert "Fixed some files"

This reverts commit 22cb9f2f1057a7b0a6dee75ddf0459cf1be0eb23.