Revert "New added changes"

This reverts commit f6fa400abd0619868fdd6d164f719602e9018a9b.