Revert "Commentec unrelevant code"

This reverts commit a414a4213b8fc2532af4668be65a828cea39eee5.