Revert "this is the first commit of the Entrance task #1971 without code clean-up"

This reverts commit c9181fbce59bdee30c184341028785f43f6a2e50.