Revert "introduced noTone and map functions, and upgrade tone function"

This reverts commit 06729850774166d1e365d536aa12633f9448a414.