Fixed I54 with cleaning some code
Revert "Fixed I54 with cleaning some code"

This reverts commit 5d15ec3c02adeb435c6e619d3ae8e4dc78e09310.