Revert "new code"

This reverts commit c0c8014336e1501be5c4098322d57b5cbc447e94.