Revert "Fixed token errors"

This reverts commit 0d5d5992e96fb27ad354f8650287445053d69b9f.
Revert "Revert "Fixed token errors""

This reverts commit 8901ba5e91d66b5153ad72a2947c57d6a4779452.
Remove surplus scripting

This reverts commit 682b8842554831b4668baf0f6ddbb1525edfd4db.